From 170e3867e3c1a4fc4827036cffb5771de4659603 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 28 Feb 2018 17:37:57 +0000
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 449916 -> 450644 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index 4781d02af81..89370213450 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -849,7 +849,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 		odk_unowinreg \
 	) \
diff --git a/configure.ac b/configure.ac
index 3286fdd02875172b62abf2cc1d35d5da52abf094..47a20889d05679614a970bbe6fb900cb577e2bf5 100644
GIT binary patch
delta 545
zcmY*W&ubGw6lV7AuDeScQ#Wlw($X>7v_geyg&rh@YM~gdEeNF`F{I6wR^#T7XxUOE
z#X=MWQ)iP8#G7XoM5%bnT?CQ#kiWpAiU%(}I3^*`fsc7_=KC?cIr<zsXvE4N*ppDe
z;&R=-n|+wg6;{(?XSW|WZPs_9a{?Y@(Qfm`W}|9Ka?!Ne8MDLTIWhchz*v~Q&Rch9
zL+lFv=xnm9V?k!avza~Iic61=w_`UqO6!@9OVV?S>53O(63V_8qW6zbUDowJ$IY(f
zolGHjFV0UVxmy6QC`0)9oX%mzr&HMcsDzQ(W?DDz_iJ?!RY8;Zv7`m?RZs#^m-XUE
z(1=*<QSs{)sTlDohOGk{MEN^exZ_h4UtTIFQGKfRpxh)4!ly8*4I02FpDrMBNMW&P
z8o2LCqej9I<%EH^d(?}IHJZS;dEIDxuhnP>&A&>l-M*;Nc^J<qg6SK~!1QC%aaf}%
z%<qy^?8(;z>(mddYLQFk|37))7M&7L%`DB#E?l+DwT;%u<mTjyPOCn~z-XPuCOY(M
qx8_n(73WDFmt&1z=B0JVwajA*OL`$7XsnX2lY}av?dR)yaPA-FNwDhx

delta 225
zcmca|K>E)v>4q(g9U|?TVvIn{v|Uq-d2!wJf}?EQ(*tDLIHrFvW96DQmDyu@)l_EV
z=~9!JC8nR83M2w1F$+!qK9yN!di)G#_UUrdfMRzlnMJ1eB(QKzkD10SHGOvi8{f3s
zOdON{d$CTRHjP<)`Ue+Q{^>`iF&j+J*vcj_oxhq{Wjg<TW{&CplbLy^hfW7dfK8h+
z9jJZJWM=;9XQwmkPT$r9R4g@v*%l-#IekVg8~^l+Gnl2P_i3=QPxqh5EH?d&B`Zg}
S&rD_@W&vW>?LITvINSj!EKbD$

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index f0b63489f05..2d9d5ee6dcb 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
 		$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 4ca21d3eaf3..8f5c422ecfa 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -41,11 +41,13 @@ ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
 	GeneratedPackage_uno_loader_classes \
 	$(if $(filter WNT,$(OS)),Library_unowinreg) \
 	Package_unowinreg \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 ))
 endif
 
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 03b58fe3da7..63e332079bc 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2